+++ /dev/null
-From 21142a1d3354b5d4e97a2e160221ae391362e8c1 Mon Sep 17 00:00:00 2001\r
-From: Jan Schlamelcher <dicom@offis.de>\r
-Date: Fri, 4 Jul 2014 12:02:51 +0200\r
-Subject: [PATCH] Fixed OFoptional by introducing OFalign?\r
-\r
----\r
- CMake/GenerateDCMTKConfigure.cmake | 29 +++\r
- CMake/osconfig.h.in | 12 +\r
- config/aclocal.m4 | 41 +++\r
- config/configure | 60 +++++\r
- config/configure.in | 2 +\r
- config/include/dcmtk/config/osconfig.h.in | 6 +\r
- ofstd/include/dcmtk/ofstd/ofalign.h | 190 ++++++++++++++\r
- ofstd/include/dcmtk/ofstd/ofoption.h | 390 +++++++++++++++++++----------\r
- ofstd/include/dcmtk/ofstd/oftraits.h | 4 +-\r
- ofstd/tests/toption.cc | 8 +\r
- 10 files changed, 610 insertions(+), 132 deletions(-)\r
- create mode 100644 ofstd/include/dcmtk/ofstd/ofalign.h\r
-\r
---- a/CMake/osconfig.h.in
-+++ b/CMake/osconfig.h.in
-@@ -1102,4 +1102,16 @@ typedef unsigned long ulong;
- /* The path on the Android device that should be used for temporary files */
- #cmakedefine ANDROID_TEMPORARY_FILES_LOCATION "@ANDROID_TEMPORARY_FILES_LOCATION@"
-
-+/* Define if the compiler supports __alignof__ */
-+#cmakedefine HAVE_GNU_ALIGNOF
-+
-+/* Define if the compiler supports __alignof */
-+#cmakedefine HAVE_MS_ALIGNOF
-+
-+/* Define if the compiler supports __attribute__(aligned) */
-+#cmakedefine HAVE_ATTRIBUTE_ALIGNED
-+
-+/* Define if the compiler supports __declspec(align) */
-+#cmakedefine HAVE_DECLSPEC_ALIGN
-+
- #endif /* !OSCONFIG_H*/
---- a/config/aclocal.m4
-+++ b/config/aclocal.m4
-@@ -1490,6 +1490,47 @@ else
- fi
- ])
-
-+AC_DEFUN([AC_CHECK_ALIGNOF],
-+[
-+ AC_MSG_CHECKING([for __alignof__])
-+ AC_LINK_IFELSE(
-+ [
-+ AC_LANG_SOURCE(
-+ [
-+ int main(){char c[__alignof__(int)];return 0;}
-+ ])
-+ ],
-+ [dcmtk_have_alignof=[yes]],
-+ [dcmtk_have_alignof=[no]]
-+ )
-+ if test "$dcmtk_have_alignof" = yes; then
-+ AC_MSG_RESULT([yes])
-+ AC_DEFINE($1,[1],[Define if __alignof__ is available])
-+ else
-+ AC_MSG_RESULT([no])
-+ fi
-+])
-+
-+AC_DEFUN([AC_CHECK_ATTRIBUTE_ALIGNED],
-+[
-+ AC_MSG_CHECKING([for __attribute__((aligned))])
-+ AC_LINK_IFELSE(
-+ [
-+ AC_LANG_SOURCE(
-+ [
-+ int main(){__attribute__((aligned(4))) char c[16];return 0;}
-+ ])
-+ ],
-+ [dcmtk_have_attribute_aligned=[yes]],
-+ [dcmtk_have_attribute_aligned=[no]]
-+ )
-+ if test "$dcmtk_have_attribute_aligned" = yes; then
-+ AC_MSG_RESULT([yes])
-+ AC_DEFINE($1,[1],[Define if __attribute__((aligned)) is available])
-+ else
-+ AC_MSG_RESULT([no])
-+ fi
-+])
-
- dnl
- dnl CHECK_VLA checks if the C Compiler supports variable-length arrays
---- a/config/configure
-+++ b/config/configure
-@@ -14575,6 +14575,66 @@ $as_echo "no" >&6; }
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __alignof__" >&5
-+$as_echo_n "checking for __alignof__... " >&6; }
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+
-+ int main(){char c__alignof__(int);return 0;}
-+
-+
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+ dcmtk_have_alignof=yes
-+else
-+ dcmtk_have_alignof=no
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ if test "$dcmtk_have_alignof" = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+$as_echo "#define HAVE_GNU_ALIGNOF 1" >>confdefs.h
-+
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ fi
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((aligned))" >&5
-+$as_echo_n "checking for __attribute__((aligned))... " >&6; }
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+
-+ int main(){__attribute__((aligned(4))) char c16;return 0;}
-+
-+
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+ dcmtk_have_attribute_aligned=yes
-+else
-+ dcmtk_have_attribute_aligned=no
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ if test "$dcmtk_have_attribute_aligned" = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+$as_echo "#define HAVE_ATTRIBUTE_ALIGNED 1" >>confdefs.h
-+
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ fi
-+
-+
- CFLAGS="$DEBUGCFLAGS $CFLAGS"
- CXXFLAGS="$DEBUGCXXFLAGS $CXXFLAGS"
-
---- a/config/include/dcmtk/config/osconfig.h.in
-+++ b/config/include/dcmtk/config/osconfig.h.in
-@@ -75,6 +75,9 @@
- /* Define if __attribute__((aligned)) is available */
- #undef HAVE_ATTRIBUTE_ALIGNED
-
-+/* Define if __attribute__((aligned)) is available */
-+#undef HAVE_ATTRIBUTE_ALIGNED
-+
- /* Define to 1 if you have the `bcmp' function. */
- #undef HAVE_BCMP
-
-@@ -263,6 +266,9 @@
-
- /* Define if __alignof__ is available */
- #undef HAVE_GNU_ALIGNOF
-+
-+/* Define if __alignof__ is available */
-+#undef HAVE_GNU_ALIGNOF
-
- /* Define to 1 if you have the <grp.h> header file. */
- #undef HAVE_GRP_H
---- a/ofstd/tests/toption.cc
-+++ b/ofstd/tests/toption.cc
-@@ -15,6 +15,11 @@ OFTEST(ofstd_optional)
-
- OFoptional<int> o0( 3 ), o1, o2( OFnullopt );
-
-+ COUT << OFalignof(OFoptional<char>) << ' ' << sizeof(OFoptional<char>) << OFendl;
-+ COUT << OFalignof(OFoptional<short>) << ' ' << sizeof(OFoptional<short>) << OFendl;
-+ COUT << OFalignof(OFoptional<float>) << ' ' << sizeof(OFoptional<float>) << OFendl;
-+ COUT << OFalignof(long) << ' ' << sizeof(long) << ' ' << OFalignof(OFoptional<long>) << ' ' << sizeof(OFoptional<long>) << OFendl;
-+
- OFCHECK( o0 && *o0 == 3 );
-
- OFCHECK( !o1 && !o2 );
--- /dev/null
+Author: Jürgen Salk <jsa@debian.org>
+Description: The original maintainer Jürgen Salk applied
+ a set of patches to the original code. This file contains
+ changes to C++ code
+Forwarded: no
+
+--- a/dcmqrdb/etc/dcmqrscp.cfg
++++ b/dcmqrdb/etc/dcmqrscp.cfg
+@@ -10,6 +10,9 @@
+ NetworkTCPPort = 104
+ MaxPDUSize = 16384
+ MaxAssociations = 16
++UserName = "dcmtk"
++GroupName = "dcmtk"
++
+ #
+ # UserName = <not used>
+ # GroupName = <not used>
+@@ -28,12 +31,13 @@ HostTable BEGIN
+ # NOTE: in the current implementation you cannot substitute an IP address
+ # for a hostname.
+ #
+-acme1 = (ACME1, acmehost1, 5678)
+-acme2 = (ACME2, acmehost2, 5678)
+-acmeCTcompany = acme1, acme2
+-united1 = (UNITED1, unitedhost1, 104)
+-united2 = (UNITED2, unitedhost2, 104)
+-unitedMRcompany = united1, united2
++# Example:
++#acme1 = (ACME1, acmehost1, 5678)
++#acme2 = (ACME2, acmehost2, 5678)
++#acmeCTcompany = acme1, acme2
++#united1 = (UNITED1, unitedhost1, 104)
++#united2 = (UNITED2, unitedhost2, 104)
++#unitedMRcompany = united1, united2
+ #
+ HostTable END
+
+@@ -51,8 +55,9 @@ VendorTable BEGIN
+ # VendorName = SymbolicName
+ # The symbolic name should be defined in the HostTable.
+ #
+-"Acme CT Company" = acmeCTcompany
+-"United MR Company" = unitedMRcompany
++# Example:
++#"Acme CT Company" = acmeCTcompany
++#"United MR Company" = unitedMRcompany
+ #
+ VendorTable END
+
+@@ -70,8 +75,13 @@ AETable BEGIN
+ # Entry in HostTable |
+ # ANY
+ #
+-COMMON /home/dicom/db/COMMON R (200, 1024mb) ANY
+-ACME_STORE /home/dicom/db/ACME_STORE RW (9, 1024mb) acmeCTcompany
+-UNITED_STORE /home/dicom/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany
++# Example:
++#
++#ACME_STORE /var/lib/dcmtk/db/ACME_STORE RW (9, 1024mb) acmeCTcompany
++#UNITED_STORE /var/lib/dcmtk/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany
++#
++# Uncomment and adjust the following lines for a common r/rw storage area:
++#READWRITE /var/lib/dcmtk/db/READWRITE RW (10, 1024mb) ANY
++#READ /var/lib/dcmtk/db/READ R (200, 1024mb) ANY
+ #
+ AETable END
+--- a/dcmqrdb/docs/dcmqrcnf.txt
++++ b/dcmqrdb/docs/dcmqrcnf.txt
+@@ -44,8 +44,8 @@ Example:
+ NetworkTCPPort = 104
+ MaxPDUSize = 8192
+ MaxAssociations = 20
+-UserName = (do not change user)
+-GroupName = (do not change group)
++UserName = "dcmtk"
++GroupName = "dcmtk"
+
+ NOTE: You must have root privileges to bind port 104 for DICOM association
+ requests on Unix/Linux/Posix platforms as this is a privileged port number
+--- /dev/null
++++ b/dcmwlm/wlistdb/OFFIS/lockfile
+@@ -0,0 +1 @@
++
+++ /dev/null
-Author: Jürgen Salk <jsa@debian.org>
-Description: The original maintainer Jürgen Salk applied
- a set of patches to the original code. The part which fixes
- the path to the perl executable is collected in this patch set.
-Forwarded: no
-
---- a/dcmwlm/perl/changepw.pl
-+++ b/dcmwlm/perl/changepw.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/checkvr.ph
-+++ b/dcmwlm/perl/checkvr.ph
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/isocode.ph
-+++ b/dcmwlm/perl/isocode.ph
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/layout.ph
-+++ b/dcmwlm/perl/layout.ph
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/lock.ph
-+++ b/dcmwlm/perl/lock.ph
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/log.ph
-+++ b/dcmwlm/perl/log.ph
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/main.pl
-+++ b/dcmwlm/perl/main.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/password.ph
-+++ b/dcmwlm/perl/password.ph
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/patidel.pl
-+++ b/dcmwlm/perl/patidel.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/patiedit.pl
-+++ b/dcmwlm/perl/patiedit.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/patient.pl
-+++ b/dcmwlm/perl/patient.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/prefs.ph
-+++ b/dcmwlm/perl/prefs.ph
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/procdel.pl
-+++ b/dcmwlm/perl/procdel.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/procedit.pl
-+++ b/dcmwlm/perl/procedit.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/procedur.pl
-+++ b/dcmwlm/perl/procedur.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/procstep.pl
-+++ b/dcmwlm/perl/procstep.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/prstdel.pl
-+++ b/dcmwlm/perl/prstdel.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/prstedit.pl
-+++ b/dcmwlm/perl/prstedit.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/statdel.pl
-+++ b/dcmwlm/perl/statdel.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/statedit.pl
-+++ b/dcmwlm/perl/statedit.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/station.pl
-+++ b/dcmwlm/perl/station.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/urldecod.ph
-+++ b/dcmwlm/perl/urldecod.ph
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright & Disclaimer.
- # This set of routines may be freely distributed, modified and
---- a/dcmwlm/perl/workdel.pl
-+++ b/dcmwlm/perl/workdel.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/workedit.pl
-+++ b/dcmwlm/perl/workedit.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/worklist.pl
-+++ b/dcmwlm/perl/worklist.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
---- a/dcmwlm/perl/write.ph
-+++ b/dcmwlm/perl/write.ph
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright (C) 1996-2010, OFFIS e.V.
- # All rights reserved. See COPYRIGHT file for details.
-@@ -42,7 +42,7 @@ sub write_environment
- if (open(outfile, ">@_[0]"))
- {
- print outfile <<EOF;
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # automatically generated by write.pl - do not modify!
- #
+++ /dev/null
-Author: Jürgen Salk <jsa@debian.org>
-Description: The original maintainer Jürgen Salk applied
- a set of patches to the original code. This file contains
- changes to C++ code
-Forwarded: no
-
---- a/dcmqrdb/etc/dcmqrscp.cfg
-+++ b/dcmqrdb/etc/dcmqrscp.cfg
-@@ -10,6 +10,9 @@
- NetworkTCPPort = 104
- MaxPDUSize = 16384
- MaxAssociations = 16
-+UserName = "dcmtk"
-+GroupName = "dcmtk"
-+
- #
- # UserName = <not used>
- # GroupName = <not used>
-@@ -28,12 +31,13 @@ HostTable BEGIN
- # NOTE: in the current implementation you cannot substitute an IP address
- # for a hostname.
- #
--acme1 = (ACME1, acmehost1, 5678)
--acme2 = (ACME2, acmehost2, 5678)
--acmeCTcompany = acme1, acme2
--united1 = (UNITED1, unitedhost1, 104)
--united2 = (UNITED2, unitedhost2, 104)
--unitedMRcompany = united1, united2
-+# Example:
-+#acme1 = (ACME1, acmehost1, 5678)
-+#acme2 = (ACME2, acmehost2, 5678)
-+#acmeCTcompany = acme1, acme2
-+#united1 = (UNITED1, unitedhost1, 104)
-+#united2 = (UNITED2, unitedhost2, 104)
-+#unitedMRcompany = united1, united2
- #
- HostTable END
-
-@@ -51,8 +55,9 @@ VendorTable BEGIN
- # VendorName = SymbolicName
- # The symbolic name should be defined in the HostTable.
- #
--"Acme CT Company" = acmeCTcompany
--"United MR Company" = unitedMRcompany
-+# Example:
-+#"Acme CT Company" = acmeCTcompany
-+#"United MR Company" = unitedMRcompany
- #
- VendorTable END
-
-@@ -70,8 +75,13 @@ AETable BEGIN
- # Entry in HostTable |
- # ANY
- #
--COMMON /home/dicom/db/COMMON R (200, 1024mb) ANY
--ACME_STORE /home/dicom/db/ACME_STORE RW (9, 1024mb) acmeCTcompany
--UNITED_STORE /home/dicom/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany
-+# Example:
-+#
-+#ACME_STORE /var/lib/dcmtk/db/ACME_STORE RW (9, 1024mb) acmeCTcompany
-+#UNITED_STORE /var/lib/dcmtk/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany
-+#
-+# Uncomment and adjust the following lines for a common r/rw storage area:
-+#READWRITE /var/lib/dcmtk/db/READWRITE RW (10, 1024mb) ANY
-+#READ /var/lib/dcmtk/db/READ R (200, 1024mb) ANY
- #
- AETable END
---- a/dcmqrdb/docs/dcmqrcnf.txt
-+++ b/dcmqrdb/docs/dcmqrcnf.txt
-@@ -44,8 +44,8 @@ Example:
- NetworkTCPPort = 104
- MaxPDUSize = 8192
- MaxAssociations = 20
--UserName = (do not change user)
--GroupName = (do not change group)
-+UserName = "dcmtk"
-+GroupName = "dcmtk"
-
- NOTE: You must have root privileges to bind port 104 for DICOM association
- requests on Unix/Linux/Posix platforms as this is a privileged port number
---- /dev/null
-+++ b/dcmwlm/wlistdb/OFFIS/lockfile
-@@ -0,0 +1 @@
-+
--- /dev/null
+Description: Remove convenient copy of CharLS
+Author: Mathieu Malaterre <malat@debian.org>
+Bug-Debian: http://bugs.debian.org/705923
+Forwarded: no
+
+--- a/dcmjpls/CMakeLists.txt
++++ b/dcmjpls/CMakeLists.txt
+@@ -2,6 +2,6 @@
+ PROJECT(dcmjpls)
+
+ # recurse into subdirectories
+-FOREACH(SUBDIR libsrc libcharls apps include)
++FOREACH(SUBDIR libsrc apps include)
+ ADD_SUBDIRECTORY(${SUBDIR})
+ ENDFOREACH(SUBDIR)
+--- a/dcmjpls/libsrc/CMakeLists.txt
++++ b/dcmjpls/libsrc/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # declare additional include directories
+-INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${dcmjpls_SOURCE_DIR}/libcharls ${ZLIB_INCDIR})
++INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${ZLIB_INCDIR})
+
+ # create library from source files
+ DCMTK_ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece)
+
+-DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage charls)
++DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage CharLS)
+--- a/dcmjpls/libsrc/djerror.h
++++ b/dcmjpls/libsrc/djerror.h
+@@ -24,7 +24,7 @@
+
+ #include "dcmtk/config/osconfig.h"
+ #include "dcmtk/dcmjpls/djlsutil.h" /* For the OFCondition codes */
+-#include "intrface.h" /* CharLS include */
++#include "CharLS/interface.h" /* CharLS include */
+
+ /** Helper class for converting between dcmjpls and CharLS error codes
+ */
+--- a/dcmjpls/libsrc/djcodecd.cc
++++ b/dcmjpls/libsrc/djcodecd.cc
+@@ -37,7 +37,7 @@
+ #include "djerror.h" /* for private class DJLSError */
+
+ // JPEG-LS library (CharLS) includes
+-#include "intrface.h"
++#include "CharLS/interface.h"
+
+ E_TransferSyntax DJLSLosslessDecoder::supportedTransferSyntax() const
+ {
+--- a/dcmjpls/libsrc/djcodece.cc
++++ b/dcmjpls/libsrc/djcodece.cc
+@@ -55,7 +55,7 @@
+ #include "dcmtk/dcmimgle/dcmimage.h" /* for class DicomImage */
+
+ // JPEG-LS library (CharLS) includes
+-#include "intrface.h"
++#include "CharLS/interface.h"
+
+ BEGIN_EXTERN_C
+ #ifdef HAVE_FCNTL_H
+--- a/dcmjpls/apps/CMakeLists.txt
++++ b/dcmjpls/apps/CMakeLists.txt
+@@ -8,5 +8,5 @@ ENDFOREACH(PROGRAM)
+
+ # make sure executables are linked to the corresponding libraries
+ FOREACH(PROGRAM dcmcjpls dcmdjpls dcml2pnm)
+- DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd)
++ DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls CharLS dcmimage dcmimgle dcmdata oflog ofstd ofstd)
+ ENDFOREACH(PROGRAM)
+--- a/dcmjpls/libcharls/CMakeLists.txt
++++ b/dcmjpls/libcharls/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ # declare additional include directories
+-INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/libcharls ${ofstd_SOURCE_DIR}/include)
++INCLUDE_DIRECTORIES(${ofstd_SOURCE_DIR}/include)
+
+ # create library from source files
+ DCMTK_ADD_LIBRARY(charls header intrface jpegls)
--- /dev/null
+Description: Install dict to versioned dir
+Author: Mathieu Malaterre <malat@debian.org>
+Bug-Debian: http://bugs.debian.org/709123
+Forwarded: no
+
+--- a/dcmdata/data/CMakeLists.txt
++++ b/dcmdata/data/CMakeLists.txt
+@@ -1,2 +1,3 @@
+ # declare installation files
+-INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
++INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
++INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data)
--- /dev/null
+From 21142a1d3354b5d4e97a2e160221ae391362e8c1 Mon Sep 17 00:00:00 2001\r
+From: Jan Schlamelcher <dicom@offis.de>\r
+Date: Fri, 4 Jul 2014 12:02:51 +0200\r
+Subject: [PATCH] Fixed OFoptional by introducing OFalign?\r
+\r
+---\r
+ CMake/GenerateDCMTKConfigure.cmake | 29 +++\r
+ CMake/osconfig.h.in | 12 +\r
+ config/aclocal.m4 | 41 +++\r
+ config/configure | 60 +++++\r
+ config/configure.in | 2 +\r
+ config/include/dcmtk/config/osconfig.h.in | 6 +\r
+ ofstd/include/dcmtk/ofstd/ofalign.h | 190 ++++++++++++++\r
+ ofstd/include/dcmtk/ofstd/ofoption.h | 390 +++++++++++++++++++----------\r
+ ofstd/include/dcmtk/ofstd/oftraits.h | 4 +-\r
+ ofstd/tests/toption.cc | 8 +\r
+ 10 files changed, 610 insertions(+), 132 deletions(-)\r
+ create mode 100644 ofstd/include/dcmtk/ofstd/ofalign.h\r
+\r
+--- a/CMake/osconfig.h.in
++++ b/CMake/osconfig.h.in
+@@ -1102,4 +1102,16 @@ typedef unsigned long ulong;
+ /* The path on the Android device that should be used for temporary files */
+ #cmakedefine ANDROID_TEMPORARY_FILES_LOCATION "@ANDROID_TEMPORARY_FILES_LOCATION@"
+
++/* Define if the compiler supports __alignof__ */
++#cmakedefine HAVE_GNU_ALIGNOF
++
++/* Define if the compiler supports __alignof */
++#cmakedefine HAVE_MS_ALIGNOF
++
++/* Define if the compiler supports __attribute__(aligned) */
++#cmakedefine HAVE_ATTRIBUTE_ALIGNED
++
++/* Define if the compiler supports __declspec(align) */
++#cmakedefine HAVE_DECLSPEC_ALIGN
++
+ #endif /* !OSCONFIG_H*/
+--- a/config/aclocal.m4
++++ b/config/aclocal.m4
+@@ -1490,6 +1490,47 @@ else
+ fi
+ ])
+
++AC_DEFUN([AC_CHECK_ALIGNOF],
++[
++ AC_MSG_CHECKING([for __alignof__])
++ AC_LINK_IFELSE(
++ [
++ AC_LANG_SOURCE(
++ [
++ int main(){char c[__alignof__(int)];return 0;}
++ ])
++ ],
++ [dcmtk_have_alignof=[yes]],
++ [dcmtk_have_alignof=[no]]
++ )
++ if test "$dcmtk_have_alignof" = yes; then
++ AC_MSG_RESULT([yes])
++ AC_DEFINE($1,[1],[Define if __alignof__ is available])
++ else
++ AC_MSG_RESULT([no])
++ fi
++])
++
++AC_DEFUN([AC_CHECK_ATTRIBUTE_ALIGNED],
++[
++ AC_MSG_CHECKING([for __attribute__((aligned))])
++ AC_LINK_IFELSE(
++ [
++ AC_LANG_SOURCE(
++ [
++ int main(){__attribute__((aligned(4))) char c[16];return 0;}
++ ])
++ ],
++ [dcmtk_have_attribute_aligned=[yes]],
++ [dcmtk_have_attribute_aligned=[no]]
++ )
++ if test "$dcmtk_have_attribute_aligned" = yes; then
++ AC_MSG_RESULT([yes])
++ AC_DEFINE($1,[1],[Define if __attribute__((aligned)) is available])
++ else
++ AC_MSG_RESULT([no])
++ fi
++])
+
+ dnl
+ dnl CHECK_VLA checks if the C Compiler supports variable-length arrays
+--- a/config/configure
++++ b/config/configure
+@@ -14575,6 +14575,66 @@ $as_echo "no" >&6; }
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __alignof__" >&5
++$as_echo_n "checking for __alignof__... " >&6; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++
++ int main(){char c__alignof__(int);return 0;}
++
++
++_ACEOF
++if ac_fn_cxx_try_link "$LINENO"; then :
++ dcmtk_have_alignof=yes
++else
++ dcmtk_have_alignof=no
++
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ if test "$dcmtk_have_alignof" = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++$as_echo "#define HAVE_GNU_ALIGNOF 1" >>confdefs.h
++
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ fi
++
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((aligned))" >&5
++$as_echo_n "checking for __attribute__((aligned))... " >&6; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++
++ int main(){__attribute__((aligned(4))) char c16;return 0;}
++
++
++_ACEOF
++if ac_fn_cxx_try_link "$LINENO"; then :
++ dcmtk_have_attribute_aligned=yes
++else
++ dcmtk_have_attribute_aligned=no
++
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ if test "$dcmtk_have_attribute_aligned" = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++$as_echo "#define HAVE_ATTRIBUTE_ALIGNED 1" >>confdefs.h
++
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ fi
++
++
+ CFLAGS="$DEBUGCFLAGS $CFLAGS"
+ CXXFLAGS="$DEBUGCXXFLAGS $CXXFLAGS"
+
+--- a/config/include/dcmtk/config/osconfig.h.in
++++ b/config/include/dcmtk/config/osconfig.h.in
+@@ -75,6 +75,9 @@
+ /* Define if __attribute__((aligned)) is available */
+ #undef HAVE_ATTRIBUTE_ALIGNED
+
++/* Define if __attribute__((aligned)) is available */
++#undef HAVE_ATTRIBUTE_ALIGNED
++
+ /* Define to 1 if you have the `bcmp' function. */
+ #undef HAVE_BCMP
+
+@@ -263,6 +266,9 @@
+
+ /* Define if __alignof__ is available */
+ #undef HAVE_GNU_ALIGNOF
++
++/* Define if __alignof__ is available */
++#undef HAVE_GNU_ALIGNOF
+
+ /* Define to 1 if you have the <grp.h> header file. */
+ #undef HAVE_GRP_H
+--- a/ofstd/tests/toption.cc
++++ b/ofstd/tests/toption.cc
+@@ -15,6 +15,11 @@ OFTEST(ofstd_optional)
+
+ OFoptional<int> o0( 3 ), o1, o2( OFnullopt );
+
++ COUT << OFalignof(OFoptional<char>) << ' ' << sizeof(OFoptional<char>) << OFendl;
++ COUT << OFalignof(OFoptional<short>) << ' ' << sizeof(OFoptional<short>) << OFendl;
++ COUT << OFalignof(OFoptional<float>) << ' ' << sizeof(OFoptional<float>) << OFendl;
++ COUT << OFalignof(long) << ' ' << sizeof(long) << ' ' << OFalignof(OFoptional<long>) << ' ' << sizeof(OFoptional<long>) << OFendl;
++
+ OFCHECK( o0 && *o0 == 3 );
+
+ OFCHECK( !o1 && !o2 );
--- /dev/null
+Author: Sebastien Jodogne <s.jodogne@chu.ulg.ac.be>
+Last-Update: Fri, 15 May 2015 16:39:01 UTC
+Bug-Debian: http://bugs.debian.org/785400
+Forwarded-Upstream: yes
+Description: Fix a DCMTK performance problem
+
+--- a/dcmnet/libsrc/dul.cc
++++ b/dcmnet/libsrc/dul.cc
+@@ -1833,7 +1833,7 @@ receiveTransportConnectionTCP(PRIVATE_NE
+ return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
+ }
+ #endif
+- setTCPBufferLength(sock);
++ //setTCPBufferLength(sock);
+
+ #ifndef DONT_DISABLE_NAGLE_ALGORITHM
+ /*
+--- a/dcmnet/libsrc/dulfsm.cc
++++ b/dcmnet/libsrc/dulfsm.cc
+@@ -2421,7 +2421,7 @@ requestAssociationTCP(PRIVATE_NETWORKKEY
+ return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
+ }
+ #endif
+- setTCPBufferLength(s);
++ //setTCPBufferLength(s);
+
+ #ifndef DONT_DISABLE_NAGLE_ALGORITHM
+ /*
--- /dev/null
+Description: Add abi-version to library name
+Author: Gert Wollny <gw.fossdev@gmail.com>
+
+--- a/CMake/dcmtkPrepare.cmake 2015-10-28 15:16:05.279429955 +0100
++++ b/CMake/dcmtkPrepare.cmake 2015-10-28 15:17:11.058822022 +0100
+@@ -56,7 +56,7 @@
+ #SET(DCMTK_PACKAGE_URL "http://www.dcmtk.org/")
+
+ # Shared library version information
+-SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}" SOVERSION "${DCMTK_ABI_VERSION}")
++SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}.abi2" SOVERSION "${DCMTK_ABI_VERSION}")
+
+ # General build options and settings
+ OPTION(BUILD_APPS "Build command line applications and test programs." ON)
--- /dev/null
+Description: Don't add executables to cmake exports
+ CMake exports are used by other packages that compile
+ and link against dcmtk. Because Debian moves some of
+ these executables and also dosn't install the test
+ executables, this import may fail leading to failure
+ to configure the according package.
+Author: Gert Wollny <gw.fossdev@gmail.com>
+Bug-Debian: http://bugs.debian.org/803304
+
+--- dcmtk-3.6.1~20150629/CMake/dcmtkMacros.cmake 2015-06-29 10:56:45.000000000 +0200
++++ dcmtk-3.6.1~20150629.new/CMake/dcmtkMacros.cmake 2015-10-28 17:34:00.561427435 +0100
+@@ -55,11 +55,11 @@
+ ENDIF(WIN32 AND NOT MINGW)
+
+ # Collect executable as part of global DCMTK_EXECUTABLE_TARGETS property
+- SET_PROPERTY(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM})
++# SET_PROPERTY(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM})
+
+ # declare installation files, also export DCMTKTargets.cmake
+ INSTALL(TARGETS ${PROGRAM}
+- EXPORT DCMTKTargets
++# EXPORT DCMTKTargets
+ COMPONENT bin
+ DESTINATION ${DCMTK_INSTALL_BINDIR})
+ ENDIF(BUILD_APPS)
+++ /dev/null
-Description: Use graphviz and prefer SVG output
-Author: Mathieu Malaterre <malat@debian.org>
-Forwarded: not-needed
-
---- a/doxygen/htmldocs.cfg
-+++ b/doxygen/htmldocs.cfg
-@@ -1611,7 +1611,7 @@ HIDE_UNDOC_RELATIONS = YES
- # toolkit from AT&T and Lucent Bell Labs. The other options in this section
- # have no effect if this option is set to NO (the default)
-
--HAVE_DOT = NO
-+HAVE_DOT = YES
-
- # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
- # allowed to run in parallel. When set to 0 (the default) doxygen will
-@@ -1728,7 +1728,7 @@ DIRECTORY_GRAPH = YES
- # HTML_FILE_EXTENSION to xhtml in order to make the SVG files
- # visible in IE 9+ (other browsers do not have this requirement).
-
--DOT_IMAGE_FORMAT = png
-+DOT_IMAGE_FORMAT = svg
-
- # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
- # enable generation of interactive SVG images that allow zooming and panning.
+++ /dev/null
-Author: Maria Valentina Marin <marivalenm@gmail.com>
-Last-Update: Sat, 27 Jun 2015 13:42:06 UTC
-Bug-Debian: http://bugs.debian.org/790133
-Description: Set HTML_TIMESTAMP to NO to make package reproducible
-
---- a/doxygen/htmldocs.cfg
-+++ b/doxygen/htmldocs.cfg
-@@ -943,7 +943,7 @@ HTML_COLORSTYLE_GAMMA = 80
- # page will contain the date and time when the page was generated. Setting
- # this to NO can help when comparing the output of multiple runs.
-
--HTML_TIMESTAMP = YES
-+HTML_TIMESTAMP = NO
-
- # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
- # documentation will contain sections that can be hidden and shown after the
+++ /dev/null
-Description: Install dict to versioned dir
-Author: Mathieu Malaterre <malat@debian.org>
-Bug-Debian: http://bugs.debian.org/709123
-Forwarded: no
-
---- a/dcmdata/data/CMakeLists.txt
-+++ b/dcmdata/data/CMakeLists.txt
-@@ -1,2 +1,3 @@
- # declare installation files
--INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
-+INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
-+INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data)
+++ /dev/null
-Description: Upstream needs libiconv and libcharset
- Debian does not ship either of them, so instead use
- iconv support from eglibc
- and use libcharset support from gettext
- We removed the tests since iconv does not work
-Author: Mathieu Malaterre <malat@debian.org>
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/701802
-Forwarded: yes
-
-Index: dcmtk-3.6.1_20131114/CMake/FindICONV.cmake
-===================================================================
---- dcmtk-3.6.1_20131114.orig/CMake/FindICONV.cmake 2013-11-14 15:08:01.000000000 +0100
-+++ dcmtk-3.6.1_20131114/CMake/FindICONV.cmake 2013-11-22 19:56:09.278241875 +0100
-@@ -14,11 +14,12 @@
- MARK_AS_ADVANCED(LIBICONV_INCLUDE_DIR)
-
- # Look for the library
--SET(LIBICONV_LIBS iconv)
--FIND_LIBRARY(LIBICONV_LIBRARY NAMES ${LIBICONV_LIBS})
--MARK_AS_ADVANCED(LIBICONV_LIBRARY)
-+#SET(LIBICONV_LIBS iconv)
-+#FIND_LIBRARY(LIBICONV_LIBRARY NAMES ${LIBICONV_LIBS})
-+#MARK_AS_ADVANCED(LIBICONV_LIBRARY)
-
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICONV REQUIRED_VARS LIBICONV_LIBRARY LIBICONV_INCLUDE_DIR)
-+#FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICONV REQUIRED_VARS LIBICONV_LIBRARY LIBICONV_INCLUDE_DIR)
-+SET(LIBICONV_FOUND TRUE)
-
- # Copy the result to output variables
- IF(LIBICONV_FOUND)
-Index: dcmtk-3.6.1_20131114/CMake/FindCharset.cmake
-===================================================================
---- dcmtk-3.6.1_20131114.orig/CMake/FindCharset.cmake 2013-11-14 15:08:01.000000000 +0100
-+++ dcmtk-3.6.1_20131114/CMake/FindCharset.cmake 2013-11-22 19:56:09.278241875 +0100
-@@ -7,10 +7,14 @@
- INCLUDE(FindPackageHandleStandardArgs)
-
- # Look for the header file
--FIND_PATH(LIBCHARSET_INCLUDE_DIR NAMES localcharset.h)
-+FIND_PATH(LIBCHARSET_INCLUDE_DIR localcharset.h
-+/usr/share/gettext/intl/
-+)
- MARK_AS_ADVANCED(LIBCHARSET_INCLUDE_DIR)
-
--SET(LIBCHARSET_LIBS charset)
-+SET(LIBCHARSET_LIBS
-+gettextlib
-+)
- FIND_LIBRARY(LIBCHARSET_LIBRARY NAMES ${LIBCHARSET_LIBS})
- MARK_AS_ADVANCED(LIBCHARSET_LIBRARY)
-
-Index: dcmtk-3.6.1_20131114/ofstd/libsrc/ofchrenc.cc
-===================================================================
---- dcmtk-3.6.1_20131114.orig/ofstd/libsrc/ofchrenc.cc 2013-11-14 15:08:01.000000000 +0100
-+++ dcmtk-3.6.1_20131114/ofstd/libsrc/ofchrenc.cc 2013-11-22 19:56:09.278241875 +0100
-@@ -28,6 +28,9 @@
- #ifdef WITH_LIBICONV
- #include <iconv.h>
- #include <localcharset.h>
-+// The following #define is important this way it turns on/off iconv support in DCMTK
-+// debian/iconv.h does not define this variable
-+//#define _LIBICONV_VERSION 0x010E
- #endif
-
- BEGIN_EXTERN_C
-@@ -469,6 +472,7 @@
- OFString versionStr = "LIBICONV, Version ";
- char buf[10];
- // extract major and minor version number
-+ int _libiconv_version = 0;
- sprintf(buf, "%i.%i", (_libiconv_version >> 8), (_libiconv_version & 0xff));
- versionStr.append(buf);
- return versionStr;
-Index: dcmtk-3.6.1_20131114/dcmdata/libsrc/dcspchrs.cc
-===================================================================
---- dcmtk-3.6.1_20131114.orig/dcmdata/libsrc/dcspchrs.cc 2013-11-14 15:08:01.000000000 +0100
-+++ dcmtk-3.6.1_20131114/dcmdata/libsrc/dcspchrs.cc 2013-11-22 19:56:09.278241875 +0100
-@@ -710,8 +710,9 @@
-
- OFBool DcmSpecificCharacterSet::isConversionLibraryAvailable()
- {
-+ return OFFalse;
- // just call the appropriate function from the underlying class
-- return OFCharacterEncoding::isLibraryAvailable();
-+// return OFCharacterEncoding::isLibraryAvailable();
- }
-
-
+++ /dev/null
-Description: Don't add executables to cmake exports
- CMake exports are used by other packages that compile
- and link against dcmtk. Because Debian moves some of
- these executables and also dosn't install the test
- executables, this import may fail leading to failure
- to configure the according package.
-Author: Gert Wollny <gw.fossdev@gmail.com>
-Bug-Debian: http://bugs.debian.org/803304
-
---- dcmtk-3.6.1~20150629/CMake/dcmtkMacros.cmake 2015-06-29 10:56:45.000000000 +0200
-+++ dcmtk-3.6.1~20150629.new/CMake/dcmtkMacros.cmake 2015-10-28 17:34:00.561427435 +0100
-@@ -55,11 +55,11 @@
- ENDIF(WIN32 AND NOT MINGW)
-
- # Collect executable as part of global DCMTK_EXECUTABLE_TARGETS property
-- SET_PROPERTY(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM})
-+# SET_PROPERTY(GLOBAL APPEND PROPERTY DCMTK_EXECUTABLE_TARGETS ${PROGRAM})
-
- # declare installation files, also export DCMTKTargets.cmake
- INSTALL(TARGETS ${PROGRAM}
-- EXPORT DCMTKTargets
-+# EXPORT DCMTKTargets
- COMPONENT bin
- DESTINATION ${DCMTK_INSTALL_BINDIR})
- ENDIF(BUILD_APPS)
+++ /dev/null
-From: Joerg Riesmeier <dicom@jriesmeier.com>
-Date: Tue, 26 Nov 2013 17:57:46 +0000 (+0100)
-Subject: Fixed issue with test "ofstd_markup_6" (Win32).
-X-Git-Url: http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff_plain;h=94ae6b50c738e64d8cefa8e07a10fc8ddd75418f
-
-Fixed issue with test "ofstd_markup_6" (Win32).
-
-Fixed issue with test "ofstd_markup_6" not running successfully on Windows
-systems (due to an incorrect length of the input string value).
----
-
-Index: dcmtk-3.6.1~20131114/ofstd/tests/tmarkup.cc
-===================================================================
---- dcmtk-3.6.1~20131114.orig/ofstd/tests/tmarkup.cc 2013-12-10 14:55:22.278290390 +0100
-+++ dcmtk-3.6.1~20131114/ofstd/tests/tmarkup.cc 2013-12-10 14:56:31.698289462 +0100
-@@ -114,7 +114,7 @@
- OFTEST(ofstd_markup_6)
- {
- OFString resultStr;
-- const size_t sourceLen = 37;
-+ const size_t sourceLen = 34;
- // XML: source string contains a NULL byte!
- const OFString sourceStr(("This is a test\0, with a NULL byte."), sourceLen);
- const OFString markupStr = "This is a test, with a NULL byte.";
+++ /dev/null
-Author: Sebastien Jodogne <s.jodogne@chu.ulg.ac.be>
-Last-Update: Fri, 15 May 2015 16:39:01 UTC
-Bug-Debian: http://bugs.debian.org/785400
-Forwarded-Upstream: yes
-Description: Fix a DCMTK performance problem
-
---- a/dcmnet/libsrc/dul.cc
-+++ b/dcmnet/libsrc/dul.cc
-@@ -1833,7 +1833,7 @@ receiveTransportConnectionTCP(PRIVATE_NE
- return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
- }
- #endif
-- setTCPBufferLength(sock);
-+ //setTCPBufferLength(sock);
-
- #ifndef DONT_DISABLE_NAGLE_ALGORITHM
- /*
---- a/dcmnet/libsrc/dulfsm.cc
-+++ b/dcmnet/libsrc/dulfsm.cc
-@@ -2421,7 +2421,7 @@ requestAssociationTCP(PRIVATE_NETWORKKEY
- return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
- }
- #endif
-- setTCPBufferLength(s);
-+ //setTCPBufferLength(s);
-
- #ifndef DONT_DISABLE_NAGLE_ALGORITHM
- /*
+++ /dev/null
-Author: Jürgen Salk <jsa@debian.org>
-Description: The original maintainer Jürgen Salk applied
- a set of patches to the original code. The part which fixes
- the path to the perl executable is collected in this patch set.
-Forwarded: no
-
---- a/dcmwlm/perl/prefs.ph
-+++ b/dcmwlm/perl/prefs.ph
-@@ -28,13 +28,13 @@
- # --------------------- WWW Server Configuration ---------------------
-
- # RELATIVE path to the WWW script directory, as seen by httpd
--$prefs{'cgi_path'} = '/cgi-bin/worklist';
-+$prefs{'cgi_path'} = '/cgi-bin/dcmtk_wlm';
-
- # RELATIVE path to the WWW html directory, as seen by httpd
--$prefs{'html_path'} = '/worklist';
-+$prefs{'html_path'} = '/dcmtk_wlm';
-
- # ABSOLUTE path to the data directory
--$prefs{'data_path'} = '/home/www/wl-data';
-+$prefs{'data_path'} = '/var/lib/dcmtk/wl-data';
-
- # ------------------ Constants - Please do not change! ------------------
-
-#01_fix_perl_script_path.patch
-02_dcmtk_3.6.0-1.patch
-#07_doxygen.patch
-#prefs.patch
-system_charls.patch
-datadic_install.patch
-#debian_iconv.patch
-#spelling.patch
-#ofstd_markup_6.patch
-#warn_unused_result.patch
-0001-Fixed-OFoptional-by-introducing-OFalign.patch
-performance.patch
-#Set-HTML_TIMESTAMP-to-NO.patch
-soversion_abi.patch
-dont_export_all_executables.patch
+01_dcmtk_3.6.0-1.patch
+02_system_charls.patch
+03_datadic_install.patch
+04_Fixed-OFoptional-by-introducing-OFalign.patch
+05_performance.patch
+06_soversion_abi.patch
+07_dont_export_all_executables.patch
+++ /dev/null
-Description: Add abi-version to library name
-Author: Gert Wollny <gw.fossdev@gmail.com>
-
---- a/CMake/dcmtkPrepare.cmake 2015-10-28 15:16:05.279429955 +0100
-+++ b/CMake/dcmtkPrepare.cmake 2015-10-28 15:17:11.058822022 +0100
-@@ -56,7 +56,7 @@
- #SET(DCMTK_PACKAGE_URL "http://www.dcmtk.org/")
-
- # Shared library version information
--SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}" SOVERSION "${DCMTK_ABI_VERSION}")
-+SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}.abi2" SOVERSION "${DCMTK_ABI_VERSION}")
-
- # General build options and settings
- OPTION(BUILD_APPS "Build command line applications and test programs." ON)
+++ /dev/null
-Description: Fix a SIGSEGV on sparc due to alignement issue
-Author: Jan Schlamelcher <dicom@offis.de>
-Origin: upstream
-Reviewed-By: Mathieu Malaterre <malat@debian.org>
-
---- dcmtk-3.6.1~20140617.orig/ofstd/include/dcmtk/ofstd/ofoption.h
-+++ dcmtk-3.6.1~20140617/ofstd/include/dcmtk/ofstd/ofoption.h
-@@ -770,8 +770,8 @@ private:
- // optimize alignment and so on. Mutable, since the content
- // itself can be modified even if it cant be (re-)assigned.
- void* content() const { return m_Content; }
-- Uint8& state() const { return m_Content[sizeof(T)]; }
-- mutable Uint8 m_Content[sizeof(T)+1];
-+ Uint64& state() const { return m_Content[sizeof(T)]; }
-+ mutable Uint64 m_Content[sizeof(T)+1];
- #endif // NOT DOXYGEN
- };
-
+++ /dev/null
-Description: spelling error reported by lintian
-Author: Mathieu Malaterre <malat@debian.org>
-Bug-Debian: http://bugs.debian.org/730635
-
-Index: dcmtk-3.6.1~20131114/dcmimage/docs/dcmquant.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmimage/docs/dcmquant.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmimage/docs/dcmquant.man 2013-11-27 15:36:37.000000000 +0100
-@@ -258,7 +258,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmimage/docs/dcmscale.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmimage/docs/dcmscale.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmimage/docs/dcmscale.man 2013-11-27 15:36:37.000000000 +0100
-@@ -243,7 +243,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmimage/docs/dcm2pnm.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmimage/docs/dcm2pnm.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmimage/docs/dcm2pnm.man 2013-11-27 15:36:37.000000000 +0100
-@@ -464,7 +464,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmsign/docs/dcmsign.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmsign/docs/dcmsign.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmsign/docs/dcmsign.man 2013-11-27 15:36:37.000000000 +0100
-@@ -224,7 +224,7 @@
- standard.
-
- Private Keys are expected in PEM or DER encoding. PEM is recommended (and
--default) because this allows to keep private keys in encrypted form. Command
-+default) because this allows one to keep private keys in encrypted form. Command
- line options control the behaviour of \b dcmsign when an encrypted PEM key is
- opened (see above). In general it is not recommended to specify the encryption
- password in the command line because the command line may be visible to other
-@@ -306,7 +306,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmnet/docs/getscu.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmnet/docs/getscu.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmnet/docs/getscu.man 2013-11-27 15:36:37.000000000 +0100
-@@ -505,7 +505,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmnet/docs/dcmsend.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmnet/docs/dcmsend.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmnet/docs/dcmsend.man 2013-11-27 15:36:37.000000000 +0100
-@@ -345,7 +345,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmnet/docs/dcmrecv.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmnet/docs/dcmrecv.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmnet/docs/dcmrecv.man 2013-11-27 15:36:37.000000000 +0100
-@@ -292,7 +292,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmnet/docs/storescp.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmnet/docs/storescp.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmnet/docs/storescp.man 2013-11-27 15:36:37.000000000 +0100
-@@ -459,7 +459,7 @@
- filenames created by \e --rename-on-eostudy to maintain the length of 8
- characters.
-
--Option \e --exec-on-reception allows to execute a certain command line after
-+Option \e --exec-on-reception allows one to execute a certain command line after
- having received and processed one DICOM object (through a C-STORE-RQ message).
- The command line to be executed is passed to this option as a parameter. The
- specified command line may contain a number of placeholders which will be
-@@ -479,7 +479,7 @@
- execution of \b storescp will not be held back. This behavior can be influenced
- with the \e --exec-sync option.
-
--Option \e --exec-on-eostudy allows to execute a certain command line when all
-+Option \e --exec-on-eostudy allows one to execute a certain command line when all
- DICOM objects that belong to one study have been received by \b storescp.
- The same placeholders as with \e --exec-on-reception may be used, except for
- '\#f', which is not supported. A study is considered complete by \b storescp
-@@ -794,7 +794,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmnet/docs/termscu.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmnet/docs/termscu.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmnet/docs/termscu.man 2013-11-27 15:36:37.000000000 +0100
-@@ -121,7 +121,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmnet/docs/echoscu.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmnet/docs/echoscu.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmnet/docs/echoscu.man 2013-11-27 15:36:37.000000000 +0100
-@@ -220,7 +220,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmnet/docs/storescu.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmnet/docs/storescu.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmnet/docs/storescu.man 2013-11-27 15:36:37.000000000 +0100
-@@ -491,7 +491,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmnet/docs/findscu.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmnet/docs/findscu.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmnet/docs/findscu.man 2013-11-27 15:36:37.000000000 +0100
-@@ -367,7 +367,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmnet/docs/movescu.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmnet/docs/movescu.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmnet/docs/movescu.man 2013-11-27 15:36:37.000000000 +0100
-@@ -656,7 +656,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmjpls/docs/dcmcjpls.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmjpls/docs/dcmcjpls.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmjpls/docs/dcmcjpls.man 2013-11-27 15:36:37.000000000 +0100
-@@ -288,7 +288,7 @@
-
- The user is responsible for making sure that the compressed images he creates
- are compliant with the DICOM standard. If in question, the \b dcmcjpls utility
--allows to convert an image to secondary capture - this SOP class does not pose
-+allows one to convert an image to secondary capture - this SOP class does not pose
- restrictions as the ones mentioned above.
-
- \section transfer_syntaxes TRANSFER SYNTAXES
-@@ -350,7 +350,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmjpls/docs/dcmdjpls.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmjpls/docs/dcmdjpls.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmjpls/docs/dcmdjpls.man 2013-11-27 15:36:37.000000000 +0100
-@@ -69,7 +69,7 @@
- -f --read-dataset
- read data set without file meta information
-
-- # This option allows to decompress JPEG-LS compressed DICOM objects that have
-+ # This option allows one to decompress JPEG-LS compressed DICOM objects that have
- # been stored as dataset without meta-header. Such a thing should not exist
- # since the transfer syntax cannot be reliably determined without meta-header,
- # but unfortunately it does.
-@@ -249,7 +249,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmjpls/docs/dcml2pnm.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmjpls/docs/dcml2pnm.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmjpls/docs/dcml2pnm.man 2013-11-27 15:36:37.000000000 +0100
-@@ -465,7 +465,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmsr/docs/dsrdump.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmsr/docs/dsrdump.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmsr/docs/dsrdump.man 2013-11-27 15:36:37.000000000 +0100
-@@ -249,7 +249,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmsr/docs/xml2dsr.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmsr/docs/xml2dsr.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmsr/docs/xml2dsr.man 2013-11-27 15:36:37.000000000 +0100
-@@ -271,7 +271,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmsr/docs/dsr2html.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmsr/docs/dsr2html.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmsr/docs/dsr2html.man 2013-11-27 15:36:37.000000000 +0100
-@@ -307,7 +307,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmsr/docs/dsr2xml.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmsr/docs/dsr2xml.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmsr/docs/dsr2xml.man 2013-11-27 15:36:37.000000000 +0100
-@@ -263,7 +263,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmdata/docs/dcmcrle.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmcrle.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmcrle.man 2013-11-27 15:36:37.000000000 +0100
-@@ -221,7 +221,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmdata/docs/dcmdrle.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmdrle.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmdrle.man 2013-11-27 15:36:37.000000000 +0100
-@@ -70,7 +70,7 @@
- -f --read-dataset
- read data set without file meta information
-
-- # This option allows to decompress RLE compressed DICOM objects that have
-+ # This option allows one to decompress RLE compressed DICOM objects that have
- # been stored as dataset without meta-header. Such a thing should not exist
- # since the transfer syntax cannot be reliably determined without meta-header,
- # but unfortunately it does.
-@@ -94,7 +94,7 @@
- +br --byte-order-reverse
- least significant byte first
-
-- # This option allows to decompress RLE compressed DICOM files in which the
-+ # This option allows one to decompress RLE compressed DICOM files in which the
- # order of byte segments is encoded in incorrect order. This only affects
- # images with more than one byte per sample.
- \endverbatim
-@@ -221,7 +221,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmdata/docs/dcmodify.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmodify.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmodify.man 2013-11-27 15:36:37.000000000 +0100
-@@ -14,7 +14,7 @@
-
- \section description DESCRIPTION
-
--\b dcmodify is a tool that allows to modify, insert and delete tags and items
-+\b dcmodify is a tool that allows one to modify, insert and delete tags and items
- in DICOM files. Sequences and tags with a value multiplicity > 1 are also
- supported. Metaheader information and the tag's VR can not be modified
- directly by \b dcmodify at this time. In addition to tag modifications,
-@@ -560,7 +560,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmdata/docs/pdf2dcm.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmdata/docs/pdf2dcm.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmdata/docs/pdf2dcm.man 2013-11-27 15:36:37.000000000 +0100
-@@ -149,7 +149,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmdata/docs/dump2dcm.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dump2dcm.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmdata/docs/dump2dcm.man 2013-11-27 15:36:37.000000000 +0100
-@@ -286,7 +286,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmdata/docs/xml2dcm.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmdata/docs/xml2dcm.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmdata/docs/xml2dcm.man 2013-11-27 15:36:37.000000000 +0100
-@@ -308,7 +308,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmdata/docs/dcm2xml.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcm2xml.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmdata/docs/dcm2xml.man 2013-11-27 15:36:37.000000000 +0100
-@@ -351,7 +351,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmdata/docs/dcmconv.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmconv.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmconv.man 2013-11-27 15:36:37.000000000 +0100
-@@ -332,7 +332,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmdata/docs/dcmgpdir.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmgpdir.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmgpdir.man 2013-11-27 15:36:37.000000000 +0100
-@@ -204,7 +204,7 @@
- A \e DICOMDIR file will only be constructed if all files have passed initial
- tests.
-
--The \b dcmgpdir utility also allows to append new entries to and to update
-+The \b dcmgpdir utility also allows one to append new entries to and to update
- existing entries in a \e DICOMDIR file. Using option \e +A new entries are
- only appended to the DICOMDIR, i.e. existing records like the ones for PATIENT
- information are not updated. Using option \e +U also existing records are
-@@ -264,7 +264,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmdata/docs/dcmdump.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcmdump.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmdata/docs/dcmdump.man 2013-11-27 15:36:37.000000000 +0100
-@@ -366,7 +366,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmdata/docs/dcm2pdf.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmdata/docs/dcm2pdf.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmdata/docs/dcm2pdf.man 2013-11-27 15:36:37.000000000 +0100
-@@ -180,7 +180,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmdata/docs/img2dcm.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmdata/docs/img2dcm.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmdata/docs/img2dcm.man 2013-11-27 15:36:37.000000000 +0100
-@@ -458,7 +458,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmimgle/docs/dcmdspfn.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmimgle/docs/dcmdspfn.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmimgle/docs/dcmdspfn.man 2013-11-27 15:36:37.000000000 +0100
-@@ -179,7 +179,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmwlm/docs/wlmscpfs.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmwlm/docs/wlmscpfs.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmwlm/docs/wlmscpfs.man 2013-11-27 15:36:37.000000000 +0100
-@@ -417,7 +417,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmqrdb/docs/dcmqrti.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmqrdb/docs/dcmqrti.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmqrdb/docs/dcmqrti.man 2013-11-27 15:36:37.000000000 +0100
-@@ -411,7 +411,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmqrdb/docs/dcmqrscp.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmqrdb/docs/dcmqrscp.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmqrdb/docs/dcmqrscp.man 2013-11-27 15:36:37.000000000 +0100
-@@ -924,7 +924,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmqrdb/docs/dcmqridx.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmqrdb/docs/dcmqridx.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmqrdb/docs/dcmqridx.man 2013-11-27 15:37:07.000000000 +0100
-@@ -14,7 +14,7 @@
-
- \section description DESCRIPTION
-
--The \b dcmqridx ulility registers DICOM image files in the database index file
-+The \b dcmqridx utility registers DICOM image files in the database index file
- used by the \b dcmqrscp and \b dcmqrti applications. No image files are copied.
- \b dcmqridx can also list the contents of the database index file.
-
-@@ -105,7 +105,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmrt/docs/drtdump.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmrt/docs/drtdump.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmrt/docs/drtdump.man 2013-11-27 15:36:37.000000000 +0100
-@@ -155,7 +155,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmdjpeg.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmjpeg/docs/dcmdjpeg.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmdjpeg.man 2013-11-27 15:36:37.000000000 +0100
-@@ -70,7 +70,7 @@
- -f --read-dataset
- read data set without file meta information
-
-- # This option allows to decompress JPEG compressed DICOM objects that
-+ # This option allows one to decompress JPEG compressed DICOM objects that
- # have been stored as dataset without meta-header. Such a thing should
- # not exist since the transfer syntax cannot be reliably determined,
- # without meta-header but unfortunately it does.
-@@ -297,7 +297,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmj2pnm.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmjpeg/docs/dcmj2pnm.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmj2pnm.man 2013-11-27 15:36:37.000000000 +0100
-@@ -509,7 +509,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmcjpeg.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmjpeg/docs/dcmcjpeg.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmcjpeg.man 2013-11-27 15:36:37.000000000 +0100
-@@ -546,7 +546,7 @@
-
- The user is responsible for making sure that the compressed images he creates
- are compliant with the DICOM standard. If in question, the \b dcmcjpeg utility
--allows to convert an image to secondary capture - this SOP class does not pose
-+allows one to convert an image to secondary capture - this SOP class does not pose
- restrictions as the ones mentioned above.
-
- With version DCMTK 3.5.4 a new encoder for truely lossless JPEG compression was
-@@ -642,7 +642,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmmkdir.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmjpeg/docs/dcmmkdir.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmjpeg/docs/dcmmkdir.man 2013-11-27 15:36:37.000000000 +0100
-@@ -362,7 +362,7 @@
- A \e DICOMDIR file will only be constructed if all files have passed initial
- tests.
-
--The \b dcmmkdir utility also allows to append new entries to and to update
-+The \b dcmmkdir utility also allows one to append new entries to and to update
- existing entries in a \e DICOMDIR file. Using option \e +A new entries are
- only appended to the DICOMDIR, i.e. existing records like the ones for PATIENT
- information are not updated. Using option \e +U also existing records are
-@@ -427,7 +427,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpsrcv.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmpsrcv.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpsrcv.man 2013-11-27 15:36:37.000000000 +0100
-@@ -100,7 +100,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpschk.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmpschk.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpschk.man 2013-11-27 15:36:37.000000000 +0100
-@@ -110,7 +110,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmprscu.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmprscu.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmprscu.man 2013-11-27 15:36:37.000000000 +0100
-@@ -171,7 +171,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpssnd.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmpssnd.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpssnd.man 2013-11-27 15:36:37.000000000 +0100
-@@ -108,7 +108,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpsprt.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmpsprt.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpsprt.man 2013-11-27 15:36:37.000000000 +0100
-@@ -282,7 +282,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmmklut.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmmklut.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmmklut.man 2013-11-27 15:36:37.000000000 +0100
-@@ -14,7 +14,7 @@
-
- \section description DESCRIPTION
-
--The \b dcmmklut utility allows to create a variety of DICOM Modality,
-+The \b dcmmklut utility allows one to create a variety of DICOM Modality,
- Presentation and VOI look-up tables (LUT) and is intended for the creation
- of test images. The utility is able to read an existing DICOM image file,
- create a look up table according to the command line options, and write
-@@ -222,7 +222,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmprscp.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmprscp.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmprscp.man 2013-11-27 15:36:37.000000000 +0100
-@@ -111,7 +111,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmp2pgm.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmp2pgm.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmp2pgm.man 2013-11-27 15:36:37.000000000 +0100
-@@ -128,7 +128,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmmkcrv.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmmkcrv.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmmkcrv.man 2013-11-27 15:36:37.000000000 +0100
-@@ -14,7 +14,7 @@
-
- \section description DESCRIPTION
-
--The \b dcmmkcrv utility allows to create DICOM images containing curve data.
-+The \b dcmmkcrv utility allows one to create DICOM images containing curve data.
- Since curve data is hardly used by vendors today, this is intended as a
- means to test implementations that can read curve data. The utility reads an
- existing DICOM image and a text file containing the curve data in textual
-@@ -156,7 +156,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
-Index: dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpsmk.man
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmpstat/docs/dcmpsmk.man 2013-11-27 15:36:37.000000000 +0100
-+++ dcmtk-3.6.1~20131114/dcmpstat/docs/dcmpsmk.man 2013-11-27 15:36:37.000000000 +0100
-@@ -223,7 +223,7 @@
- whitespaces are treated as a single separator unless they appear between two
- quotation marks) prior to any further evaluation. Please note that a command
- file cannot contain another command file. This simple but effective approach
--allows to summarize common combinations of options/parameters and avoids
-+allows one to summarize common combinations of options/parameters and avoids
- longish and confusing command lines (an example is provided in file
- <em>\<datadir\>/dumppat.txt</em>).
-
+++ /dev/null
-Description: Remove convenient copy of CharLS
-Author: Mathieu Malaterre <malat@debian.org>
-Bug-Debian: http://bugs.debian.org/705923
-Forwarded: no
-
---- a/dcmjpls/CMakeLists.txt
-+++ b/dcmjpls/CMakeLists.txt
-@@ -2,6 +2,6 @@
- PROJECT(dcmjpls)
-
- # recurse into subdirectories
--FOREACH(SUBDIR libsrc libcharls apps include)
-+FOREACH(SUBDIR libsrc apps include)
- ADD_SUBDIRECTORY(${SUBDIR})
- ENDFOREACH(SUBDIR)
---- a/dcmjpls/libsrc/CMakeLists.txt
-+++ b/dcmjpls/libsrc/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # declare additional include directories
--INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${dcmjpls_SOURCE_DIR}/libcharls ${ZLIB_INCDIR})
-+INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${ZLIB_INCDIR})
-
- # create library from source files
- DCMTK_ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece)
-
--DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage charls)
-+DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage CharLS)
---- a/dcmjpls/libsrc/djerror.h
-+++ b/dcmjpls/libsrc/djerror.h
-@@ -24,7 +24,7 @@
-
- #include "dcmtk/config/osconfig.h"
- #include "dcmtk/dcmjpls/djlsutil.h" /* For the OFCondition codes */
--#include "intrface.h" /* CharLS include */
-+#include "CharLS/interface.h" /* CharLS include */
-
- /** Helper class for converting between dcmjpls and CharLS error codes
- */
---- a/dcmjpls/libsrc/djcodecd.cc
-+++ b/dcmjpls/libsrc/djcodecd.cc
-@@ -37,7 +37,7 @@
- #include "djerror.h" /* for private class DJLSError */
-
- // JPEG-LS library (CharLS) includes
--#include "intrface.h"
-+#include "CharLS/interface.h"
-
- E_TransferSyntax DJLSLosslessDecoder::supportedTransferSyntax() const
- {
---- a/dcmjpls/libsrc/djcodece.cc
-+++ b/dcmjpls/libsrc/djcodece.cc
-@@ -55,7 +55,7 @@
- #include "dcmtk/dcmimgle/dcmimage.h" /* for class DicomImage */
-
- // JPEG-LS library (CharLS) includes
--#include "intrface.h"
-+#include "CharLS/interface.h"
-
- BEGIN_EXTERN_C
- #ifdef HAVE_FCNTL_H
---- a/dcmjpls/apps/CMakeLists.txt
-+++ b/dcmjpls/apps/CMakeLists.txt
-@@ -8,5 +8,5 @@ ENDFOREACH(PROGRAM)
-
- # make sure executables are linked to the corresponding libraries
- FOREACH(PROGRAM dcmcjpls dcmdjpls dcml2pnm)
-- DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd)
-+ DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls CharLS dcmimage dcmimgle dcmdata oflog ofstd ofstd)
- ENDFOREACH(PROGRAM)
---- a/dcmjpls/libcharls/CMakeLists.txt
-+++ b/dcmjpls/libcharls/CMakeLists.txt
-@@ -1,5 +1,5 @@
- # declare additional include directories
--INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/libcharls ${ofstd_SOURCE_DIR}/include)
-+INCLUDE_DIRECTORIES(${ofstd_SOURCE_DIR}/include)
-
- # create library from source files
- DCMTK_ADD_LIBRARY(charls header intrface jpegls)
+++ /dev/null
-Description: Fix all issues with -Wunused-result
- Eg:
- dcmqrcnf.cc:294:43: warning: ignoring return value of 'char* fgets(char*, int,
- FILE*)', declared with attribute warn_unused_result [-Wunused-result]
-Author: Mathieu Malaterre <malat@debian.org>
-Bug-Debian: http://bugs.debian.org/731434
-Forwarded: no
-
-Index: dcmtk-3.6.1~20131114/dcmimage/libsrc/dicoimg.cc
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmimage/libsrc/dicoimg.cc 2013-12-10 14:55:18.658290442 +0100
-+++ dcmtk-3.6.1~20131114/dcmimage/libsrc/dicoimg.cc 2013-12-10 14:56:36.194289404 +0100
-@@ -680,8 +680,9 @@
- if ((OutputData != NULL) && (OutputData->getData() != NULL))
- {
- fprintf(stream, "P6\n%u %u\n%lu\n", Columns, Rows, DicomImageClass::maxval(bits));
-- fwrite(OutputData->getData(), OFstatic_cast(size_t, OutputData->getCount()), OutputData->getItemSize(), stream);
-- return 1;
-+ size_t tobewritten = OutputData->getItemSize();
-+ size_t written = fwrite(OutputData->getData(), OFstatic_cast(size_t, OutputData->getCount()), OutputData->getItemSize(), stream);
-+ if( written == tobewritten) return 1;
- }
- }
- }
-Index: dcmtk-3.6.1~20131114/dcmsign/libsrc/simaccon.cc
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmsign/libsrc/simaccon.cc 2013-12-10 14:55:18.634290445 +0100
-+++ dcmtk-3.6.1~20131114/dcmsign/libsrc/simaccon.cc 2013-12-10 14:56:36.194289404 +0100
-@@ -61,8 +61,15 @@
- stream.flushBuffer(bufptr, bufLen);
- if (bufLen > 0)
- {
-- if (dumpFile) fwrite(bufptr, 1, (size_t)bufLen, dumpFile);
-- result = mac.digest((unsigned char *)bufptr, (unsigned long)bufLen);
-+ size_t written = (size_t)bufLen;
-+ if (dumpFile)
-+ {
-+ written = fwrite(bufptr, 1, (size_t)bufLen, dumpFile);
-+ }
-+ if( written == (size_t)bufLen )
-+ result = mac.digest((unsigned char *)bufptr, (unsigned long)bufLen);
-+ else
-+ result = EC_DirectoryNotWritable;
- }
- return result;
- }
-Index: dcmtk-3.6.1~20131114/dcmdata/libsrc/dcvrobow.cc
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmdata/libsrc/dcvrobow.cc 2013-12-10 14:55:18.686290438 +0100
-+++ dcmtk-3.6.1~20131114/dcmdata/libsrc/dcvrobow.cc 2013-12-10 14:56:36.198289404 +0100
-@@ -214,13 +214,21 @@
- {
- swapIfNecessary(EBO_LittleEndian, gLocalByteOrder, data, getLengthField(), sizeof(Uint16));
- setByteOrder(EBO_LittleEndian);
-- fwrite(data, sizeof(Uint16), OFstatic_cast(size_t, getLengthField() / sizeof(Uint16)), file);
-+ size_t tobewritten = OFstatic_cast(size_t, getLengthField() / sizeof(Uint16));
-+ size_t written = fwrite(data, sizeof(Uint16), tobewritten, file);
-+ if( written != tobewritten )
-+ DCMDATA_WARN("DcmOtherByteOtherWord: Some bytes were not written: " << (tobewritten - written) );
- }
- } else {
- Uint8 *data = NULL;
- getUint8Array(data);
- if (data != NULL)
-- fwrite(data, sizeof(Uint8), OFstatic_cast(size_t, getLengthField()), file);
-+ {
-+ size_t tobewritten = OFstatic_cast(size_t, getLengthField());
-+ size_t written = fwrite(data, sizeof(Uint8), tobewritten, file);
-+ if( written != tobewritten )
-+ DCMDATA_WARN("DcmOtherByteOtherWord: Some bytes were not written: " << (tobewritten - written) );
-+ }
- }
- fclose(file);
- } else {
-Index: dcmtk-3.6.1~20131114/dcmimgle/libsrc/diimage.cc
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmimgle/libsrc/diimage.cc 2013-12-10 14:55:18.694290443 +0100
-+++ dcmtk-3.6.1~20131114/dcmimgle/libsrc/diimage.cc 2013-12-10 14:56:36.198289404 +0100
-@@ -809,31 +809,40 @@
- swapBytes(OFreinterpret_cast(Uint8 *, palette), 256 * 4 /*byteLength*/, 4 /*valWidth*/);
- }
- /* write bitmap file header: do not write the struct because of 32-bit alignment */
-- fwrite(&fileHeader.bfType, sizeof(fileHeader.bfType), 1, stream);
-- fwrite(&fileHeader.bfSize, sizeof(fileHeader.bfSize), 1, stream);
-- fwrite(&fileHeader.bfReserved1, sizeof(fileHeader.bfReserved1), 1, stream);
-- fwrite(&fileHeader.bfReserved2, sizeof(fileHeader.bfReserved2), 1, stream);
-- fwrite(&fileHeader.bfOffBits, sizeof(fileHeader.bfOffBits), 1, stream);
-+ size_t singleitem; // should always be equal to 1 in the following:
-+ singleitem = fwrite(&fileHeader.bfType, sizeof(fileHeader.bfType), 1, stream);
-+ singleitem = singleitem && fwrite(&fileHeader.bfSize, sizeof(fileHeader.bfSize), 1, stream);
-+ singleitem = singleitem && fwrite(&fileHeader.bfReserved1, sizeof(fileHeader.bfReserved1), 1, stream);
-+ singleitem = singleitem && fwrite(&fileHeader.bfReserved2, sizeof(fileHeader.bfReserved2), 1, stream);
-+ singleitem = singleitem && fwrite(&fileHeader.bfOffBits, sizeof(fileHeader.bfOffBits), 1, stream);
- /* write bitmap info header: do not write the struct because of 32-bit alignment */
-- fwrite(&infoHeader.biSize, sizeof(infoHeader.biSize), 1, stream);
-- fwrite(&infoHeader.biWidth, sizeof(infoHeader.biWidth), 1, stream);
-- fwrite(&infoHeader.biHeight, sizeof(infoHeader.biHeight), 1, stream);
-- fwrite(&infoHeader.biPlanes, sizeof(infoHeader.biPlanes), 1, stream);
-- fwrite(&infoHeader.biBitCount, sizeof(infoHeader.biBitCount), 1, stream);
-- fwrite(&infoHeader.biCompression, sizeof(infoHeader.biCompression), 1, stream);
-- fwrite(&infoHeader.biSizeImage, sizeof(infoHeader.biSizeImage), 1, stream);
-- fwrite(&infoHeader.biXPelsPerMeter, sizeof(infoHeader.biXPelsPerMeter), 1, stream);
-- fwrite(&infoHeader.biYPelsPerMeter, sizeof(infoHeader.biYPelsPerMeter), 1, stream);
-- fwrite(&infoHeader.biClrUsed, sizeof(infoHeader.biClrUsed), 1, stream);
-- fwrite(&infoHeader.biClrImportant, sizeof(infoHeader.biClrImportant), 1, stream);
-+ singleitem = singleitem && fwrite(&infoHeader.biSize, sizeof(infoHeader.biSize), 1, stream);
-+ singleitem = singleitem && fwrite(&infoHeader.biWidth, sizeof(infoHeader.biWidth), 1, stream);
-+ singleitem = singleitem && fwrite(&infoHeader.biHeight, sizeof(infoHeader.biHeight), 1, stream);
-+ singleitem = singleitem && fwrite(&infoHeader.biPlanes, sizeof(infoHeader.biPlanes), 1, stream);
-+ singleitem = singleitem && fwrite(&infoHeader.biBitCount, sizeof(infoHeader.biBitCount), 1, stream);
-+ singleitem = singleitem && fwrite(&infoHeader.biCompression, sizeof(infoHeader.biCompression), 1, stream);
-+ singleitem = singleitem && fwrite(&infoHeader.biSizeImage, sizeof(infoHeader.biSizeImage), 1, stream);
-+ singleitem = singleitem && fwrite(&infoHeader.biXPelsPerMeter, sizeof(infoHeader.biXPelsPerMeter), 1, stream);
-+ singleitem = singleitem && fwrite(&infoHeader.biYPelsPerMeter, sizeof(infoHeader.biYPelsPerMeter), 1, stream);
-+ singleitem = singleitem && fwrite(&infoHeader.biClrUsed, sizeof(infoHeader.biClrUsed), 1, stream);
-+ singleitem = singleitem && fwrite(&infoHeader.biClrImportant, sizeof(infoHeader.biClrImportant), 1, stream);
- /* write color palette (if applicable) */
-- if (palette != NULL)
-- fwrite(palette, 4, 256, stream);
-+ if (singleitem && palette != NULL)
-+ {
-+ size_t paletteitems = fwrite(palette, 4, 256, stream);
-+ if( paletteitems != 256 ) singleitem = 0;
-+ }
- /* write pixel data */
-- fwrite(data, 1, OFstatic_cast(size_t, bytes), stream);
-+ if( singleitem )
-+ {
-+ size_t pddata = fwrite(data, 1, OFstatic_cast(size_t, bytes), stream);
-+ if( pddata != OFstatic_cast(size_t, bytes)) singleitem = 0;
-+ }
- /* delete color palette */
- delete[] palette;
-- result = 1;
-+ if( singleitem )
-+ result = 1;
- }
- /* delete pixel data */
- delete OFstatic_cast(char *, data); // type cast necessary to avoid compiler warnings using gcc >2.95
-Index: dcmtk-3.6.1~20131114/dcmimgle/libsrc/dimoimg.cc
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmimgle/libsrc/dimoimg.cc 2013-12-10 14:55:18.706290444 +0100
-+++ dcmtk-3.6.1~20131114/dcmimgle/libsrc/dimoimg.cc 2013-12-10 14:56:36.198289404 +0100
-@@ -2143,9 +2143,10 @@
- fprintf(stream, "P6\n%u %u\n255\n", Columns, Rows);
- else
- fprintf(stream, "P5\n%u %u\n%lu\n", Columns, Rows, DicomImageClass::maxval(bits));
-- fwrite(OutputData->getData(), OFstatic_cast(size_t, OutputData->getCount()), OutputData->getItemSize(), stream);
-+ size_t tobewritten = OutputData->getItemSize();
-+ size_t written = fwrite(OutputData->getData(), OFstatic_cast(size_t, OutputData->getCount()), OutputData->getItemSize(), stream);
- deleteOutputData();
-- return 1;
-+ if( written == tobewritten ) return 1;
- }
- }
- return 0;
-Index: dcmtk-3.6.1~20131114/dcmqrdb/libsrc/dcmqrcnf.cc
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmqrdb/libsrc/dcmqrcnf.cc 2013-12-10 14:55:18.674290443 +0100
-+++ dcmtk-3.6.1~20131114/dcmqrdb/libsrc/dcmqrcnf.cc 2013-12-10 14:56:36.198289404 +0100
-@@ -291,7 +291,12 @@
- char *c;
-
- while (!feof(cnffp)) {
-- fgets(rcline, sizeof(rcline), cnffp); /* read line in configuration file */
-+ char *ret = fgets(rcline, sizeof(rcline), cnffp); /* read line in configuration file */
-+ if( !ret )
-+ {
-+ error = 1;
-+ break;
-+ }
- lineno++;
- if (feof(cnffp)) continue;
- if (rcline[0] == '#' || rcline[0] == 10 || rcline[0] == 13)
-@@ -413,7 +418,12 @@
- DcmQueryRetrieveConfigHostEntry *helpentry;
-
- while (!feof(cnffp)) {
-- fgets(rcline, sizeof(rcline), cnffp); /* read line in configuration file */
-+ char *ret = fgets(rcline, sizeof(rcline), cnffp); /* read line in configuration file */
-+ if( !ret )
-+ {
-+ error = 1;
-+ break;
-+ }
- (*lineno)++;
- if (feof(cnffp)) continue;
- if (rcline[0] == '#' || rcline[0] == 10 || rcline[0] == 13)
-@@ -469,7 +479,12 @@
- DcmQueryRetrieveConfigHostEntry *helpentry;
-
- while (!feof(cnffp)) {
-- fgets(rcline, sizeof(rcline), cnffp); /* read line in configuration file */
-+ char * ret = fgets(rcline, sizeof(rcline), cnffp); /* read line in configuration file */
-+ if( !ret )
-+ {
-+ error = 1;
-+ break;
-+ }
- (*lineno)++;
- if (feof(cnffp)) continue;
- if (rcline[0] == '#' || rcline[0] == 10 || rcline[0] == 13)
-@@ -525,7 +540,12 @@
- DcmQueryRetrieveConfigAEEntry *helpentry;
-
- while (!feof(cnffp)) {
-- fgets(rcline, sizeof(rcline), cnffp); /* read line in configuration file */
-+ char * ret = fgets(rcline, sizeof(rcline), cnffp); /* read line in configuration file */
-+ if( !ret )
-+ {
-+ error = 1;
-+ break;
-+ }
- (*lineno)++;
- if (feof(cnffp)) continue;
- if (rcline[0] == '#' || rcline[0] == 10 || rcline[0] == 13)
-Index: dcmtk-3.6.1~20131114/dcmqrdb/libsrc/dcmqrdbi.cc
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmqrdb/libsrc/dcmqrdbi.cc 2013-12-10 14:55:18.666290445 +0100
-+++ dcmtk-3.6.1~20131114/dcmqrdb/libsrc/dcmqrdbi.cc 2013-12-10 14:56:36.198289404 +0100
-@@ -3416,7 +3416,8 @@
-
- record.hstat = DVIF_objectIsNotNew;
- DB_lseek(handle_->pidx, OFstatic_cast(long, SIZEOF_STUDYDESC + idx * SIZEOF_IDXRECORD), SEEK_SET);
-- write(handle_->pidx, OFreinterpret_cast(char *, &record), SIZEOF_IDXRECORD);
-+ ssize_t written = write(handle_->pidx, OFreinterpret_cast(char *, &record), SIZEOF_IDXRECORD);
-+ if( written != SIZEOF_IDXRECORD ) result = EC_DirectoryNotWritable;
- DB_lseek(handle_->pidx, 0L, SEEK_SET);
- DB_unlock();
- }
-Index: dcmtk-3.6.1~20131114/dcmpstat/apps/dcmp2pgm.cc
-===================================================================
---- dcmtk-3.6.1~20131114.orig/dcmpstat/apps/dcmp2pgm.cc 2013-12-10 14:55:18.646290441 +0100
-+++ dcmtk-3.6.1~20131114/dcmpstat/apps/dcmp2pgm.cc 2013-12-10 14:56:36.198289404 +0100
-@@ -363,9 +363,12 @@
- if (ofile)
- {
- fprintf(ofile, "P5\n%d %d 255\n", overlayWidth, overlayHeight);
-- fwrite(overlayData, overlayWidth, overlayHeight, ofile);
-+ size_t written = fwrite(overlayData, overlayWidth, overlayHeight, ofile);
- fclose(ofile);
-- oss << " - written." << OFendl;
-+ if( written == overlayHeight )
-+ oss << " - written." << OFendl;
-+ else
-+ oss << " -write error-" << OFendl;
- } else oss << " -write error-" << OFendl;
- } else {
- oss << " unable to access overlay data!" << OFendl;
-@@ -546,8 +549,12 @@
- {
- OFLOG_DEBUG(dcmp2pgmLogger, "writing PGM file: " << opt_pgmName);
- fprintf(outfile, "P5\n%ld %ld 255\n", width, height);
-- fwrite(pixelData, (size_t)width, (size_t)height, outfile);
-+ size_t written = fwrite(pixelData, (size_t)width, (size_t)height, outfile);
- fclose(outfile);
-+ if( written != (size_t)height ) {
-+ OFLOG_FATAL(dcmp2pgmLogger, "Can't create output data.");
-+ return 10;
-+ }
- } else {
- OFLOG_FATAL(dcmp2pgmLogger, "Can't create output file.");
- return 10;
# improper md5sum...
%:
- dh $@ --parallel
+ dh $@ --parallel --buildsystem=cmake
# -DDCMTK_INSTALL_DATDIR:STRING=libdcmtk4
+# SKIP_RPATH=OFF to run test suite:
+# see #701231
+CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
+ -DDCMTK_WITH_OPENSSL:BOOL=ON \
+ -DDCMTK_WITH_PRIVATE_TAGS:BOOL=ON \
+ -DDCMTK_WITH_XML:BOOL=ON \
+ -DDCMTK_WITH_DOXYGEN:BOOL=$(BUILDDOC) \
+ -DDCMTK_WITH_TIFF:BOOL=ON \
+ -DDCMTK_WITH_ZLIB:BOOL=ON \
+ -DDCMTK_WITH_ICONV:BOOL=ON \
+ -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk4 \
+ -DCMAKE_SKIP_RPATH:BOOL=OFF
+
+# -DCMAKE_INSTALL_PREFIX=/usr \
+
override_dh_auto_configure:
- cd config && ./autoall && cd .. && \
- dh_auto_configure -- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --includedir=\$${prefix}/include \
- --libdir=\$${prefix}/lib \
- --datadir=\$${prefix}/share/libdcmtk2 \
- --sysconfdir=/etc/$(pkg) \
- --with-private-tags \
- --with-libxml \
- --with-libtiff \
- --with-zlib \
- --with-libpng \
- --with-libwrap \
- --with-openssl
+ dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
+
+override_dh_auto_build-arch:
+ # need man page in -arch packages:
+ #$(MAKE) -C obj-* man
+ dh_auto_build
+
+# Let's be smart with building doc
+override_dh_auto_build-indep:
+ $(MAKE) -C obj-* DOXYGEN
# No tests needed for docs
override_dh_auto_test-indep:
-# if config/Makefile.def is not availabe then we assume this is
-# a clean source tree
-override_dh_auto_clean:
- if [ -f config/Makefile.def ] ; then dh_auto_clean; fi
-
override_dh_auto_install-arch:
dh_auto_install
# ??
mv debian/tmp/usr/etc debian/tmp/
override_dh_auto_install-indep:
- DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C doxygen install
+ #DESTDIR=debian/tmp $(MAKE) -C obj-*/doxygen install
+ DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C obj-*/doxygen install
+ #rm debian/dcmtk/usr/share/man/man1/_tmp_buildd*
+ #rm debian/tmp/usr/share/man/man1/_tmp_buildd*
rm debian/tmp/usr/share/man/man1/_*.1
override_dh_installdocs:
mv ./debian/dcmtk/usr/bin/writwlst debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/
override_dh_strip:
- dh_strip --dbg-package=libdcmtk5-dbg
+ dh_strip --dbg-package=libdcmtk4v5-dbg
get-orig-source:
uscan --force-download --verbose --rename
projects / dcmtk.git / commitdiff